Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

next: resolve merge conflicts with main #639

Merged
merged 24 commits into from
Aug 3, 2024
Merged

next: resolve merge conflicts with main #639

merged 24 commits into from
Aug 3, 2024

Conversation

huntabyte
Copy link
Owner

@huntabyte huntabyte commented Aug 3, 2024 •
edited
Loading

Wow, it's been 4 months since we've merged main into next

huntabyte and others added 24 commits April 12, 2024 19:51
@huntabyte
chore: add plausible (#455)
1fa7192
@huntabyte
chore: add plausible (#456)
819477f
@AndreMorise
docs: add DateValue type reference (#462)
e966830 
Co-authored-by: Andre Morise <andre.morise@pax.us>
@Stadly @huntabyte
Fix binding button element (#473)
7342d3f 
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
@github-actions
Version Packages (#475)
e882d64 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@huntabyte
chore: update readme (#486)
ba08d99
@huntabyte
chore: issue template (#487)
fe3259f
@AdrianGonz97
chore: Replaced all self-closing non-void elements (#518)
20593aa
@github-actions
Version Packages (#519)
f883bb7 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@huntabyte @AdrianGonz97
chore: update peer deps to include Svelte 5 (#525)
564b03a 
Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
@github-actions
Version Packages (#526)
e1c85eb 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@AdrianGonz97
chore: Making it more Svelte 5 compatible (#529)
98d5bd0
@github-actions
Version Packages (#530)
36bb232 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@NDOY3M4N @huntabyte
fix: ContentProps type (#545)
c71f987 
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
@jeannemas @huntabyte
fix: Updated ComboboxLabelProps to use HTMLLabelAttributes (#544)
1691ef9 
Co-authored-by: Hunter Johnston <64506580+huntabyte@users.noreply.github.com>
@github-actions
Version Packages (#548)
47e0ce9 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@huntabyte
feat: forward additional events from <Button> (#550)
46e5828
@github-actions
Version Packages (#551)
531a040 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@huntabyte
fix: allow overriding the combobox input id (#553)
32af944
@wysher
fix: date pickers clear (#549)
5e257aa
@github-actions
Version Packages (#554)
68d7aa6 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@RatulMaharaj
docs: Update ScrollArea import (#574)
6d5ff24 
* docs: fix ScrollArea import

* style: Use double quotes
@huntabyte
Merge branch 'main' into next-main-merged
1d2f94b
@huntabyte
next main merged
e2d75cc
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Aug 3, 2024

⚠️ No Changeset found

Latest commit: e2d75cc

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 3, 2024 •
edited
Loading

built with Refined Cloudflare Pages Action

⚡ Cloudflare Pages Deployment

Name Status Preview Last Commit
bits-ui ✅ Ready (View Log) Visit Preview e2d75cc

@huntabyte huntabyte added the publish:preview Add to PRs to publish preview packages with `pkg-pr-new` label Aug 3, 2024
@pkg-pr-new pkg.pr.new
Copy link

pkg-pr-new bot commented Aug 3, 2024

commit: e2d75cc

pnpm add https://pkg.pr.new/bits-ui@639

Open in Stackblitz •

@huntabyte huntabyte merged commit 578fd7b into next Aug 3, 2024
7 checks passed
@huntabyte huntabyte deleted the next-main-merged branch September 24, 2024 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
publish:preview Add to PRs to publish preview packages with `pkg-pr-new`
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@huntabyte @AndreMorise @Stadly @AdrianGonz97 @NDOY3M4N @jeannemas @wysher @RatulMaharaj